Small cleanups

svn path=/trunk/; revision=18488

diff --git a/ChangeLog b/ChangeLog
index 14a723adad70c80d0e89b475954aba29e084b7de..23d9c741502cb8d0e0017b504c88ce89dc63efad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkicontheme.c: Small cleanups
+
 2007-07-17  Kristian Rietveld  <kris@imendio.com>
 
        * gtk/gtktooltip.c (find_widget_under_pointer): only do the

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 89c793042a8ffd3af6f94c9f1ce22a050cba767a..3121d86c9c05222b0f0e84dcde91830cecbf2d21 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1493,8 +1493,8 @@ gtk_icon_theme_load_icon (GtkIconTheme         *icon_theme,
                        (flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
   
-  icon_info  = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
-                                          flags | GTK_ICON_LOOKUP_USE_BUILTIN);
+  icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
+                                         flags | GTK_ICON_LOOKUP_USE_BUILTIN);
   if (!icon_info)
     {
       g_set_error (error, GTK_ICON_THEME_ERROR,  GTK_ICON_THEME_NOT_FOUND,
@@ -2901,8 +2901,6 @@ GdkPixbuf *
 gtk_icon_info_load_icon (GtkIconInfo *icon_info,
                         GError     **error)
 {
-  g_return_val_if_fail (icon_info != NULL, NULL);
-
   g_return_val_if_fail (icon_info != NULL, NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
@@ -2916,7 +2914,7 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
                      GTK_ICON_THEME_NOT_FOUND,
                      _("Failed to load icon"));
  
-     return NULL;
+      return NULL;
     }
 
   return g_object_ref (icon_info->pixbuf);